Skip to content

Conversation

@emrysal
Copy link
Contributor

@emrysal emrysal commented Aug 20, 2022

Needed for #3872 #3898

Needs tests, only a PR without draft as it is a PR to another draft.

@calcom/web:dev: s.workingHours [
  {"days":[3],"startTime":0,"endTime":60},
  {"days":[1],"startTime":780,"endTime":840},
  {"days":[1,3,4],"startTime":960,"endTime":1439},
  {"days":[2],"startTime":960,"endTime":1439}
] America/Phoenix
@calcom/web:dev: s.workingHours [
  {"days":[3],"startTime":0,"endTime":60},
  {"days":[1],"startTime":480,"endTime":1080},
  {"days":[2],"startTime":1380,"endTime":1439}
] Europe/London
@calcom/web:dev: aggregate: [
@calcom/web:dev:   { days: [ 3 ], startTime: 0, endTime: 60 },
@calcom/web:dev:   { days: [ 3 ], startTime: 960, endTime: 60 },
@calcom/web:dev:   { days: [ 1 ], startTime: 780, endTime: 840 },
@calcom/web:dev:   { days: [ 1 ], startTime: 960, endTime: 1080 },
@calcom/web:dev:   { days: [ 2 ], startTime: 1380, endTime: 1439 }
@calcom/web:dev: ]

@vercel
Copy link

vercel bot commented Aug 20, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ❌ Failed (Inspect) Aug 20, 2022 at 0:20AM (UTC)
1 Ignored Deployment
Name Status Preview Updated
swagger ⬜️ Ignored (Inspect) Aug 20, 2022 at 0:20AM (UTC)

@CodingRockz
Copy link

@emrysal Have tested it and can confirm that it fixes the team calendar issue for collective events. Thanks for your contribution.

@zomars zomars merged commit ee369fa into fixes/3872 Aug 22, 2022
@zomars zomars deleted the wip/getAggregateWorkingHours branch August 22, 2022 16:16
kodiakhq bot pushed a commit that referenced this pull request Aug 22, 2022
#3898)

* WIP

* Fix for team availability with time offsets

* Prevent empty schedule from opening up everything

* When no utcOffset or timeZone's are given, default to 0 utcOffset (UTC)

* timeZone should not be part of getUserAvailability

* Prevents {days:[X],startTime:0,endTime:0} error entry

* Added getAggregateWorkingHours() (#3913)

* Added test for getAggregateWorkingHours

* Timezone isn't used here anymore

* fix: developer docs url (#3914)

* fix: developer docs url added

* chore : remove /

* chore : import url

Co-authored-by: Zach Waterfield <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* Test fixes

* Reinstate prisma (generate only) and few comments

* Test fixes

* Skipping getSchedule again

* Added await to expect() as it involves async logic causing the promise to timeout

* Test cleanup

* Update jest.config.ts

Co-authored-by: Alan <[email protected]>
Co-authored-by: Alex van Andel <[email protected]>
Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Zach Waterfield <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>
zomars added a commit that referenced this pull request Aug 23, 2022
* Close.com App (#3709)

* WIP close.com app

* Removing leaked dev key (now invalid)

* Misspelled env variable

* Making progress still WIP

* Progress + tests

* Final touches

* More unit tests

* Finished up tests

* Merge main

* Removing unneeded stuff + submodules

* Removing static props, fields fix

* Removing unneeded stuff p2

* Commenting

* Standarizing APIs

* Zodifying

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <[email protected]>

* fix: padding of kBarTrigger (#3846)

* fixes issue with variables not working (#3859)

Co-authored-by: CarinaWolli <[email protected]>

* fix: remove redundant AND (#3833)

Co-authored-by: hussamkhatib <[email protected]>

* Hotfix: Embed - Fix issue in accessing sessionStorage in certain scenarios (#3851)

* Fixes issue when sessionStorage is not accessible in privacy focussed modes in various browsers

* Fix eslint errors

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

* fixed iframe in lark suite, added lark contact info (#3866)

* fixed iframe in lark suite, added lark contact info

* Update _metadata.ts

* Update Railway Template (#3862)

* Update Railway Template

* Update URL

Co-authored-by: Peer Richelsen <[email protected]>

* New Crowdin translations by Github Action (#3857)

Co-authored-by: Crowdin Bot <[email protected]>

* Attempt at redirect to 404 (#3877)

* Attempt at redirect to 404

404 should be able to handle the traffic no problem - better ideas welcome. Just a temp fix I imagine; we're not going to want to keep this nor can we expect the User-Agent to continue identifying the traffic source.

* Update next.config.js

Co-authored-by: zomars <[email protected]>

* hotfix dynamic issue (#3864)

* Hotfix/dos mitigation attempt error configuration (#3879)

* Fixes 'Task timed out after 60.03 seconds'

* DDoS rewrite fixes

Co-authored-by: zomars <[email protected]>

* Fix desktop app link (#3883)

* fixed 404 logo on cal video (#3885)

* Update all Yarn dependencies (2022-07-29) (#3599)

* Update all Yarn dependencies (2022-07-29)

* Adds syncpack config

* Fixes mismatches

* Update yarn.lock

* RRule fixes

* Locking dayjs to fix build

* Type fixes

* Fixes mismatches

* Submodule sync

* Update yarn.lock

* Update event.ts

* Conflict fixes

* Fixes prisma warnings

* Liting

* Upgrade next, zod

* Prevents articfact overwriting

* Yarn fixes

* Jest fixes

* Submodule sync

* Formatting

* Submodule sync

* Adds provider for react-tooltip

* Removed dotenv-cli

* Readds dotenv-cli

* Skips getSchedule tests

Until prisma is mocked properly

* Fixes

* Revert prisma seed script

* E2E fixes

* test

* Removed deprecated req.page in middleware

* Make tests stable

* Unskip getSchedule tests

* fixed 404 logo on cal video (#3885)

* Removed PW aliases as aren't needed anymore

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <[email protected]>
Co-authored-by: Hariom Balhara <[email protected]>
Co-authored-by: Alex van Andel <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* Submodule sync

* temporally removed missing calendar badge on event-types (#3889)

* New Crowdin translations by Github Action (#3878)

Co-authored-by: Crowdin Bot <[email protected]>

* use default cursor on desktop (#3876)

* New Crowdin translations by Github Action (#3890)

Co-authored-by: Crowdin Bot <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* NEXTAUTH_DOMAIN isn't used

* Sync submodules

* New Crowdin translations by Github Action (#3897)

Co-authored-by: Crowdin Bot <[email protected]>

* adjust react version

* Revert "adjust react version"

This reverts commit 6e161da.

* cancel booking new design added (#3660)

* feat:  cancel booking new design added

* style: add space-y in button

* style: ui fixed for recurring booking

* fix: scroll in recurring event and use translation

* style: text 2xl instead of text-[24px]

* fix: typo, spacing

* fix: replaced multiple h2 tags with div

* fix: padding and Icon name

* Revert " cancel booking new design added" (#3922)

This reverts commit a06c564.

* New Crowdin translations by Github Action (#3909)

Co-authored-by: Crowdin Bot <[email protected]>

* New Crowdin translations by Github Action (#3924)

Co-authored-by: Crowdin Bot <[email protected]>

* New Crowdin translations by Github Action (#3926)

Co-authored-by: Crowdin Bot <[email protected]>

* fix/auto-connect-calendar-3582 (#3891)

* Added alert when there isn't default calendar connected

* Add default calendar externalId to select placeholder

* Fix typos

* Fixes prisma import

Co-authored-by: Peer Richelsen <[email protected]>
Co-authored-by: zomars <[email protected]>

* redesigned cancel page to new design (#3923)

Co-authored-by: Alex van Andel <[email protected]>

* New Crowdin translations by Github Action (#3927)

Co-authored-by: Crowdin Bot <[email protected]>

* New Crowdin translations by Github Action (#3929)

Co-authored-by: Crowdin Bot <[email protected]>

* Design issues on success page in some languages (#3900)

Co-authored-by: gitstart <[email protected]>
Co-authored-by: Nitesh Singh <[email protected]>
Co-authored-by: Júlio Piubello da Silva Cabral <[email protected]>
Co-authored-by: Matheus Muniz <[email protected]>
Co-authored-by: Matheus Benini <[email protected]>
Co-authored-by: Grace Nshokano <[email protected]>
Co-authored-by: Matheus Muniz <[email protected]>
Co-authored-by: gitstart <[email protected]>
Co-authored-by: Murilo Amaral <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* fix: developer docs url (#3914)

* fix: developer docs url added

* chore : remove /

* chore : import url

Co-authored-by: Zach Waterfield <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* Fixes collective availability for teams with overlapping day timezones (#3898)

* WIP

* Fix for team availability with time offsets

* Prevent empty schedule from opening up everything

* When no utcOffset or timeZone's are given, default to 0 utcOffset (UTC)

* timeZone should not be part of getUserAvailability

* Prevents {days:[X],startTime:0,endTime:0} error entry

* Added getAggregateWorkingHours() (#3913)

* Added test for getAggregateWorkingHours

* Timezone isn't used here anymore

* fix: developer docs url (#3914)

* fix: developer docs url added

* chore : remove /

* chore : import url

Co-authored-by: Zach Waterfield <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* Test fixes

* Reinstate prisma (generate only) and few comments

* Test fixes

* Skipping getSchedule again

* Added await to expect() as it involves async logic causing the promise to timeout

* Test cleanup

* Update jest.config.ts

Co-authored-by: Alan <[email protected]>
Co-authored-by: Alex van Andel <[email protected]>
Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Zach Waterfield <[email protected]>
Co-authored-by: Peer Richelsen <[email protected]>

* v1.9.1

Co-authored-by: Leo Giovanetti <[email protected]>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <[email protected]>
Co-authored-by: Udit Takkar <[email protected]>
Co-authored-by: Carina Wollendorfer <[email protected]>
Co-authored-by: CarinaWolli <[email protected]>
Co-authored-by: mohammed hussam <[email protected]>
Co-authored-by: hussamkhatib <[email protected]>
Co-authored-by: Hariom Balhara <[email protected]>
Co-authored-by: Jake Cooper <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <[email protected]>
Co-authored-by: Alex van Andel <[email protected]>
Co-authored-by: Syed Ali Shahbaz <[email protected]>
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Julian Benegas <[email protected]>
Co-authored-by: alannnc <[email protected]>
Co-authored-by: GitStart <[email protected]>
Co-authored-by: gitstart <[email protected]>
Co-authored-by: Nitesh Singh <[email protected]>
Co-authored-by: Júlio Piubello da Silva Cabral <[email protected]>
Co-authored-by: Matheus Muniz <[email protected]>
Co-authored-by: Matheus Benini <[email protected]>
Co-authored-by: Grace Nshokano <[email protected]>
Co-authored-by: Matheus Muniz <[email protected]>
Co-authored-by: gitstart <[email protected]>
Co-authored-by: Murilo Amaral <[email protected]>
Co-authored-by: Zach Waterfield <[email protected]>
@PeerRich PeerRich added the core area: core, team members only label Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core area: core, team members only

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants